Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

# Conflicts:
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java

@@ -16,7 +16,6 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.R;
 import com.mogo.module.common.api.CallChatApi;
 import com.mogo.module.common.constants.DataTypes;
-import com.mogo.module.common.kt.ScopeManager;
 import com.mogo.module.common.utils.SimpleHandlerThreadPool;
 import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.realtime.entity.MogoSnapshotSetData;
@@ -110,10 +109,10 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     }
 
     /**
-     * 清除就数据操作
+     * 清除旧数据操作
      *
-     * @param data
-     * @return
+     * @param data 自车周边数据
+     * @return 清除结果
      */
     private boolean clear( MogoSnapshotSetData data ) {
         if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) {
@@ -144,7 +143,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
         return false;
     }
 
-    Map< String, String > cloudKeyCache = new ArrayMap<>();
+    Map<String,String> cloudKeyCache = new ArrayMap<>();
 
     /**
      * mogo 他车、mogo 他车识别的社会车辆、路边单元识别的车辆
@@ -216,8 +215,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     /**
      * 绘制 marker
      *
-     * @param data
-     * @return
+     * @param data 道路数据
+     * @return {@link IMogoMarker}
      */
     public IMogoMarker drawSnapshotDataMarker( CloudRoadData data ) {
         if ( data == null ) {
@@ -258,8 +257,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     /**
      * 获取车辆 3d 模型
      *
-     * @param data
-     * @return
+     * @param data 道路数据
+     * @return 3D车辆模型id
      */
     public int getVrModelResId( CloudRoadData data ) {
         switch ( data.getFromType() ) {
@@ -276,8 +275,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     /**
      * 生成 2d marker 资源
      *
-     * @param data
-     * @return
+     * @param data 道路数据
+     * @return marker
      */
     public View inflateView( CloudRoadData data ) {
         View rootView = LayoutInflater.from( AbsMogoApplication.getApp() ).inflate( R.layout.module_commons_layout_car, null );
@@ -291,8 +290,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     /**
      * 获取车辆2d贴图
      *
-     * @param data
-     * @return
+     * @param data 道路数据
+     * @return 2D贴图id
      */
     private int get2DModel( CloudRoadData data ) {
         switch ( data.getFromType() ) {
@@ -317,7 +316,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     /**
      * 展示用户信息米娜版
      *
-     * @param data
+     * @param data 道路数据
      */
     private void showCarCallPanel( CloudRoadData data ) {