提高adas版本到1.0.6.3

.idea/gradle.xml

@@ -77,7 +77,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

config.gradle

@@ -154,7 +154,7 @@ targetSdkVersion               : 22,
             gpssimulatordebug          : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}",
             gpssimulatornoop           : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}",
 
-            adasapi                    : "com.zhidao.autopilot.support:adas:1.0.1",
+            adasapi                    : "com.zhidao.autopilot.support:adas:1.0.6.3",
             adasconfigapi              : "com.zhidao.adasconfig:adasconfig:1.1.5",
 
             // 个人中心的SDK

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/OwnCarModelEntity.java

@@ -0,0 +1,13 @@
+package com.mogo.module.common.entity;
+
+/**
+ * 自车模型实体，用于从服务端获取不同等级的自车模型信息以及将此信息传递给adas
+ *
+ * @author tongchenfei
+ */
+public class OwnCarModelEntity {
+    private boolean isLocked;
+    private String ownCarLocationUrl;
+    private String adasCarModelUrl;
+    private int level;
+}

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java

@@ -6,7 +6,10 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.utils.logger.Logger;
 
 /**
+ * 没有地图场景下，topView底层蒙版帮助类，因为有两个地方涉及到蒙版的显示隐藏{@link TopViewAnimHelper}和{@link TopViewNoLinkageAnimHelper}
+ * 为了不冲突，采用显示计数的方式进行兼容
  *
+ * @author tongchenfei
  */
 public class NoMapTopViewShaderHelper {
     private static final String TAG = "NoMapTopViewShaderHelper";

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

@@ -94,11 +94,30 @@ public class MogoADASController implements IMogoADASController {
             }
         } );
         invokeShowADASOperation();
+        AutopilotServiceManage.getInstance().registerAutopilotDataListener(new IAutopolitDataCallBack() {
+            @Override
+            public void sendMsg(String msg) {
+                Logger.d(TAG, "收到adas数据回调: " + msg);
+                for (IMogoAdasDataCallback callback : adasDataCallbackList) {
+                    callback.onAdasDataCallback(msg);
+                }
+            }
 
-        AutopilotServiceManage.getInstance().registerAutopilotDataListener(msg -> {
-            Logger.d(TAG, "收到adas数据回调: " + msg);
-            for (IMogoAdasDataCallback callback : adasDataCallbackList) {
-                callback.onAdasDataCallback(msg);
+            @Override
+            public void cameraEyeDetectResult(String detectResult) {
+
+            }
+
+            @Override
+            public void selectCarModelUrl(String carStyleUrl) {
+                // todo 修改自车图标展示
+            }
+
+            @Override
+            public void requestGetCarModelListInfo() {
+                // todo 向adas发送车模list
+                // 图标列表，
+//                AutopilotServiceManage.getInstance().settingCarModelListInfo();
             }
         });
     }