[Fix]解决Merge操作产生的问题

config.gradle

@@ -221,6 +221,7 @@ ext {
             mogoaicloudtanlu             : "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}",
             mogoaicloudtrafficlive       : "com.mogo.cloud:trafficlive:${MOGO_TRAFFICLIVE_VERSION}",
             mogoaicloudlocation          : "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}",
+            mogoaicloudtelematic         : "com.mogo.cloud:telematic:${MOGO_TELEMATIC_VERSION}",
 
             //========================= 新架构的 Maven 版本管理 =========================
             mogo_core_function_autopilot : "com.mogo.eagle.core.function.impl:autopilot:${MOGO_CORE_FUNCTION_AUTOPILOT_VERSION}",

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java

@@ -16,6 +16,7 @@ import com.zhidao.support.adas.high.bean.AutopilotSpeedParam;
 import com.zhidao.support.adas.high.bean.BaseInfo;
 import com.zhidao.support.adas.high.bean.BasicInfo;
 import com.zhidao.support.adas.high.bean.ConfigInfo;
+import com.zhidao.support.adas.high.bean.DemoModeInfo;
 import com.zhidao.support.adas.high.bean.FaceLoginResponse;
 import com.zhidao.support.adas.high.bean.MapLocationInfo;
 import com.zhidao.support.adas.high.bean.SSHResult;
@@ -68,6 +69,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
 
     private FpgaSocket mSocket;
     private SocketReader socketReader;
+
     private JSONObject jsonObject;
     /**
      * udp server
@@ -322,6 +324,16 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         return isClient;
     }
 
+    @Override
+    public void enableDemoMode() {
+        sendBaseInfo(DemoModeInfo.enable());
+    }
+
+    @Override
+    public void disableDemoMode() {
+        sendBaseInfo(DemoModeInfo.disable());
+    }
+
     /**
      * 配置信息
      *

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java

@@ -333,4 +333,18 @@ public class AdasManager implements IAdasNetCommApi {
     public boolean isClient() {
         return mChannel == null || mChannel.isClient();
     }
+
+    @Override
+    public void enableDemoMode() {
+        if (mChannel != null) {
+            mChannel.enableDemoMode();
+        }
+    }
+
+    @Override
+    public void disableDemoMode() {
+        if (mChannel != null) {
+            mChannel.disableDemoMode();
+        }
+    }
 }