Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher 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

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

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

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'
 

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() ).

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());
     }
 }

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

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

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:

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

@@ -21,6 +21,7 @@ import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.autopilot.support.api.AutopilotServiceManage;
+import com.zhidao.autopilot.support.api.IAutopilotServiceStatusListener;
 
 import org.json.JSONObject;
 
@@ -69,11 +70,23 @@ public class MogoADASController implements IMogoADASController {
     public void showADAS() {
 
         Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
-        if ( !isProcessRunning( AbsMogoApplication.getApp(), getPackageUid( AbsMogoApplication.getApp(), "com.zhidiao.autopilot" ) )
-                || mIsReleased ) {
-            init( AbsMogoApplication.getApp() );
-        }
+        init( AbsMogoApplication.getApp() );
+        AutopilotServiceManage.getInstance().registerAutopilotServiceStatusListener( new IAutopilotServiceStatusListener() {
+            @Override
+            public void onServiceConnected() {
+                invokeShowADASOperation();
+            }
 
+            @Override
+            public void onServiceDisconnected() {
+
+            }
+        } );
+        invokeShowADASOperation();
+
+    }
+
+    private void invokeShowADASOperation() {
         int delay = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 0 : 100;
 
         UiThreadHandler.postDelayed( () -> {