From 0e960be1f91601d73158a5fee5a9ee460be83403 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 17 Jul 2020 14:41:44 +0800
Subject: [PATCH] opt

---
 .idea/misc.xml                                            | 2 +-
 .../src/main/java/com/mogo/commons/network/Utils.java     | 8 +++++++-
 .../service/marker/UserDataMarkerInfoWindowAdapter.java   | 2 ++
 .../mogo/service/impl/connection/MogoSocketManager.java   | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.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>
\ No newline at end of file
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 21c8991b5a..f4040a23c5 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
@@ -7,6 +7,7 @@ import android.telephony.CellLocation;
 import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
+import android.text.TextUtils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -55,11 +56,16 @@ public class Utils {
 
     public static final String GET = "get";
     public static final String GSM_SERIAL = "gsm.serial";
+    public static final String BYD_SERIAL = "ro.serialno";
     public static final String FOTA_VERSION = "ro.fota.version";
     public static final String PROPERTIES = "android.os.SystemProperties";
 
     public static String getSn() {
-        return getSystemProperties( GSM_SERIAL );
+        String sn = getSystemProperties( GSM_SERIAL );
+        if ( TextUtils.isEmpty( sn ) ) {
+            sn = getSystemProperties( BYD_SERIAL );
+        }
+        return sn;
     }
 
     public static String getFotaVersion() {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
index ae5fc33693..31116f19a2 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
@@ -96,6 +96,8 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
             mContent = mInfoWindowView.findViewById( R.id.module_service_id_content );
             mTag = mInfoWindowView.findViewById( R.id.module_service_id_tag );
             mCall = mInfoWindowView.findViewById( R.id.module_service_id_call );
+
+            mCall.setVisibility( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ? View.GONE : View.VISIBLE );
         }
 
         try {
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
index 63e066ac4f..ba4e8154e6 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
@@ -70,5 +70,9 @@ public class MogoSocketManager implements IMogoSocketManager {
         } catch ( Exception e ) {
             Logger.e( TAG, e, "error." );
         }
+
+        if ( mDelegate != null ) {
+            mDelegate.init( context );
+        }
     }
 }