diff --git a/app/build.gradle b/app/build.gradle
index 6f8ca1f9fe..67abe3d98e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,6 +87,7 @@ android {
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
             // 是否作为 launcher 运行
             buildConfigField 'boolean', 'IS_LAUNCHER', 'false'
+            buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
         }
         // launcher app
         launcher{
@@ -98,6 +99,7 @@ android {
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
             // 是否作为 launcher 运行
             buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
+            buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
         }
         // f系列-分体机全系列，未细分
         f8xx{
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index e2b375ce99..14972303d6 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -91,6 +91,7 @@ public class MogoApplication extends AbsMogoApplication {
         DebugConfig.setActiveAIAssistFlag( BuildConfig.AI_ASSIST_ACTIVE_STAUTS );
         DebugConfig.setCarMachineType( BuildConfig.CAR_MACHINE_TYPE );
         DebugConfig.setProductFlavor( BuildConfig.FLAVOR_product );
+        DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID );
     }
 
     @Override
@@ -98,7 +99,7 @@ public class MogoApplication extends AbsMogoApplication {
         super.init();
         UiThreadHandler.postDelayed( () -> {
             final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
-            apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), "com.mogo.launcher" );
+            apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), DebugConfig.getSocketAppId() );
             apis.getPassportManagerApi().requestTicket( new IMogoTicketCallback() {
                 @Override
                 public void onSuccess( String ticket ) {
diff --git a/foudations/mogo-base-services-sdk/build.gradle b/foudations/mogo-base-services-sdk/build.gradle
index 7f78e77ec2..df02926d16 100644
--- a/foudations/mogo-base-services-sdk/build.gradle
+++ b/foudations/mogo-base-services-sdk/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     // 长链
     implementation 'com.zhidao.socket:built-in-socket:1.0.13'
     // passport
-    implementation 'com.zhidao.tcloginsdk:tclogin:1.0.7.3'
+    implementation 'com.zhidao.tcloginsdk:tclogin:1.0.9'
 
     annotationProcessor 'com.elegant.spi:compiler:1.0.3'
 
diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
index 754ab1cbfa..35fcc26723 100644
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
@@ -74,7 +74,7 @@ class MogoLocationInfoServices implements IMogoLocationInfoService {
     @Override
     public void init( Context context ) {
         LocUploadConfig.instance().
-                setAppId( "dataCrawler" ).
+                setAppId( DebugConfig.getSocketAppId() ).
                 setContext( context.getApplicationContext() ).
                 setLocEnvironment( getEnvironment() ).
                 setLoggable( DebugConfig.isDebug() ).
diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
index 98298019e3..5ff405fa41 100644
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
@@ -11,6 +11,7 @@ import com.mogo.service.passport.IMogoTicketCallback;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.accountsdk.manager.CarPadClientManagerImpl;
 import com.zhidao.accountsdk.manager.TicketInfoCallback;
+import com.zhidao.accountsdk.network.NetEnvironManager;
 import com.zhidao.tcloginsdk.LoginManager;
 
 public
@@ -95,6 +96,6 @@ class PassportManager implements IMogoPassportManager {
             mode = DebugConfig.NET_MODE_QA;
         }
         LoginManager.getInstance( context ).setNetEnviron( mode );
-        LoginManager.getInstance( context ).login(true, DebugConfig.getProductFlavor());
+        LoginManager.getInstance( context ).login(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE, DebugConfig.getProductFlavor());
     }
 }
diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
index cd588b0434..0f08a1aa94 100644
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
@@ -87,7 +87,7 @@ class SocketManager implements IMogoSocketManager, Callback {
                 .setEnvironment( getEnvironment() )
                 .setClient( Platform.getClient( Platform.car ) )
                 .setAppId( appId )
-                .setOpenAnalytics( true )
+//                .setOpenAnalytics( true )
                 .setDebug( DebugConfig.isDebug() );
         SocketMessageDispatcher.getInstance().start( context );
     }
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 4ef12b6383..fff915fbb3 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
@@ -227,4 +227,14 @@ public class DebugConfig {
     public static void setProductFlavor( String sProductFlavor ) {
         DebugConfig.sProductFlavor = sProductFlavor;
     }
+
+    private static String sSocketAppId;
+
+    public static void setSocketAppId( String sSocketAppId ) {
+        DebugConfig.sSocketAppId = sSocketAppId;
+    }
+
+    public static String getSocketAppId() {
+        return sSocketAppId;
+    }
 }
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
index f4040a23c5..90bc9e507d 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -2,6 +2,7 @@ package com.mogo.commons.network;
 
 import android.Manifest;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.telephony.CellLocation;
 import android.telephony.TelephonyManager;
@@ -9,6 +10,10 @@ import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
 import android.text.TextUtils;
 
+import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.utils.storage.SharedPrefsMgr;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -61,11 +66,11 @@ public class Utils {
     public static final String PROPERTIES = "android.os.SystemProperties";
 
     public static String getSn() {
-        String sn = getSystemProperties( GSM_SERIAL );
-        if ( TextUtils.isEmpty( sn ) ) {
-            sn = getSystemProperties( BYD_SERIAL );
+
+        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
+            return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
         }
-        return sn;
+        return getSystemProperties( GSM_SERIAL );
     }
 
     public static String getFotaVersion() {
diff --git a/gradle.properties b/gradle.properties
index 90669c17d7..5c9f866ed9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -60,7 +60,7 @@ MOGO_MODULE_V2X_VERSION=1.2.1.20
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.2
+MOGO_MODULE_TANLU_VERSION=1.3.1.5
 # 车聊聊
 CARCHATTING_VERSION=1.4.6
 # 车聊聊接口
@@ -78,7 +78,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.2
+TANLULIB_VERSION=1.3.1.5
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt
index 055f1ee6ed..5e2ad53c7d 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt
@@ -131,6 +131,7 @@ open class IMogoAuthorizeController {
                 }
             }
             onError {
+                //todo
                 Logger.d(TAG, it.message ?: "checkIfNeedAuthorize onError, message is null")
                 setAuthorizeStatus(agreementType, true)
             }
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
index 7fe63c7fdb..6c91ab12fc 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
@@ -18,7 +18,7 @@ open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke {
 
     override fun needAuthorize(tag: String): Boolean {
         Logger.d(TAG, "===== needAuthorize update agreement in background")
-//        baseController.checkIfNeedAuthorize(tag.toAuthorizeType())
+        baseController.checkIfNeedAuthorize(tag.toAuthorizeType())
         return needAuthorization(tag.toAuthorizeType())
     }
 
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
index 13c2da0e65..a82249ad1a 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
@@ -21,7 +21,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog
         }
     }
 
-    private var mContext:Context? = null
+    private var mContext: Context? = null
 
     private var authorizeDialog: AuthorizeDialog? = null
 
@@ -41,7 +41,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog
 
     fun invokeAuthorizeForShow(context: Context) {
         mContext = context
-//        pushLayoutToMainWindow(AUTHORIZE_TYPE_LAUNCHER_MAIN)
+        pushLayoutToMainWindow(AUTHORIZE_TYPE_LAUNCHER_MAIN)
     }
 
     fun showAuthorizeView(tag: String, forbiddenVoice: (() -> Unit), onError: ((String) -> Unit)) {
@@ -64,7 +64,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog
         Logger.d(TAG, "ready to forbidden voice")
         forbiddenVoice.invoke()
         Logger.d(TAG, "ready to push fragment")
-//        pushLayoutToMainWindow(tag)
+        pushLayoutToMainWindow(tag)
     }
 
     fun hideAuthorizeView() {
@@ -73,7 +73,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog
 
     private fun pushLayoutToMainWindow(tag: String) {
         if (authorizeDialog == null) {
-            authorizeDialog = AuthorizeDialog(tag,mContext!!)
+            authorizeDialog = AuthorizeDialog(tag, mContext!!)
         }
         if (authorizeDialog!!.isShowing) {
             Logger.d(TAG, "User is operation authorization, do not repeat invoke")
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
index 4dc7287746..b3c3e6f23b 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
@@ -7,12 +7,14 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.module.authorize.R
 import com.mogo.module.authorize.util.AnalyticsUtil
 import com.mogo.module.authorize.voice.IVoiceAuthorizeIntentListener
 import com.mogo.module.authorize.voice.IVoiceCommandListener
 import com.mogo.module.authorize.voice.VoiceUtil
 import com.mogo.module.common.dialog.BaseFloatDialog
+import com.mogo.utils.TipToast
 import com.mogo.utils.logger.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -21,6 +23,10 @@ import kotlinx.coroutines.withContext
 
 class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandListener, IVoiceAuthorizeIntentListener {
 
+    companion object {
+        const val TAG = "AuthorizeDialog"
+    }
+
     private var mContext: Context? = null
     private var invokeTag: String? = null
 
@@ -49,14 +55,28 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList
 
     private fun initView() {
         setContentView(R.layout.module_authorize_fragment)
+        setWrapContent()
         initViews()
     }
 
+    private fun setWrapContent() {
+        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){
+            return
+        }
+        val mWindow = window
+        if (mWindow != null) {
+            val lp = mWindow.attributes
+            lp.width = 1920
+            lp.height = 1000
+            mWindow.attributes = lp
+        }
+    }
+
     fun initViews() {
-        Logger.d(AuthorizeLayout.TAG, "initView ")
+        Logger.d(TAG, "initView ")
         AnalyticsUtil.track(AnalyticsUtil.INVOKE_TRACK_AUTHORIZE_SHOW)
         init()
-        Logger.d(AuthorizeLayout.TAG, "invokeTag :$invokeTag")
+        Logger.d(TAG, "invokeTag :$invokeTag")
         authorizeController = AuthorizeController(invokeTag!!)
         invokeAuthorizationContent()
         VoiceUtil.registerAll(this, this)
@@ -117,8 +137,9 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList
     }
 
     private fun voiceAuthorizeError() {
+        TipToast.shortTip("授权失败，请稍后重试")
         VoiceUtil.speak(AbsMogoApplication.getApp().applicationContext.getString(R.string.module_authorize_failed), AbsMogoApplication.getApp().applicationContext, this)
-        Logger.d(AuthorizeLayout.TAG, "onDestroy")
+        Logger.d(TAG, "onDestroy")
         VoiceUtil.unregisterAll(AbsMogoApplication.getApp().applicationContext, this)
     }
 
@@ -136,7 +157,7 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList
                 invokeAuthorizationContent()
             }
             R.id.clAuthorizeTopParent -> {
-                Logger.i(AuthorizeLayout.TAG, "dismiss authorizeView")
+                Logger.i(TAG, "dismiss authorizeView")
                 authorizeController?.onDestroy()
             }
         }
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 56f3d8aa44..5384a5c664 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/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().resetContext(this);
         mMogoStatusManager = mServiceApis.getStatusManagerApi();
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, true );
         AutopilotServiceManage.getInstance().init( getContext() );
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-1920x1000/module_main_launcher_bg.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-1920x1000/module_main_launcher_bg.png
new file mode 100644
index 0000000000..e322c3ccb2
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-1920x1000/module_main_launcher_bg.png differ
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
index f783c4d80c..60810062c4 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
@@ -67,6 +67,9 @@ public class KwPresenter extends BaseMediaPresenter<IMusicView> {
         });
 
         kwapi.registerPlayerStatusListener((playerStatus, music) -> {
+            if ( music == null ) {
+                return;
+            }
             Log.d(TAG, "onPlayerStatusListener: " + playerStatus + " music: " + music.name);
             switch (playerStatus) {
                 case BUFFERING: